Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 1 | git-submodule(1) |
| 2 | ================ |
| 3 | |
| 4 | NAME |
| 5 | ---- |
| 6 | git-submodule - Initialize, update or inspect submodules |
| 7 | |
| 8 | |
| 9 | SYNOPSIS |
| 10 | -------- |
Junio C Hamano | 7a4a283 | 2007-07-07 21:53:22 | [diff] [blame] | 11 | [verse] |
Junio C Hamano | ac28f43 | 2012-11-21 21:58:58 | [diff] [blame] | 12 | 'git submodule' [--quiet] add [-b <branch>] [-f|--force] [--name <name>] |
Junio C Hamano | ededf2b | 2013-07-15 21:11:16 | [diff] [blame] | 13 | [--reference <repository>] [--depth <depth>] [--] <repository> [<path>] |
Junio C Hamano | 0e066b9 | 2009-08-28 01:08:41 | [diff] [blame] | 14 | 'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...] |
Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 15 | 'git submodule' [--quiet] init [--] [<path>...] |
Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 16 | 'git submodule' [--quiet] deinit [-f|--force] (--all|[--] <path>...) |
Junio C Hamano | 6806162 | 2013-03-01 22:13:37 | [diff] [blame] | 17 | 'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch] |
Junio C Hamano | fedb1b4 | 2016-06-20 21:23:40 | [diff] [blame] | 18 | [--[no-]recommend-shallow] [-f|--force] [--rebase|--merge] |
| 19 | [--reference <repository>] [--depth <depth>] [--recursive] |
| 20 | [--jobs <n>] [--] [<path>...] |
Junio C Hamano | e1296e9 | 2011-08-08 22:58:15 | [diff] [blame] | 21 | 'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) <n>] |
| 22 | [commit] [--] [<path>...] |
Junio C Hamano | 0e066b9 | 2009-08-28 01:08:41 | [diff] [blame] | 23 | 'git submodule' [--quiet] foreach [--recursive] <command> |
Junio C Hamano | 38d0253 | 2014-06-26 21:48:50 | [diff] [blame] | 24 | 'git submodule' [--quiet] sync [--recursive] [--] [<path>...] |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 25 | |
| 26 | |
Junio C Hamano | f69a0a0 | 2008-07-17 08:08:47 | [diff] [blame] | 27 | DESCRIPTION |
| 28 | ----------- |
Junio C Hamano | 8c5d594 | 2015-06-11 19:37:48 | [diff] [blame] | 29 | Inspects, updates and manages submodules. |
Junio C Hamano | f69a0a0 | 2008-07-17 08:08:47 | [diff] [blame] | 30 | |
Junio C Hamano | 8c5d594 | 2015-06-11 19:37:48 | [diff] [blame] | 31 | A submodule allows you to keep another Git repository in a subdirectory |
| 32 | of your repository. The other repository has its own history, which does not |
| 33 | interfere with the history of the current repository. This can be used to |
| 34 | have external dependencies such as third party libraries for example. |
| 35 | |
| 36 | When cloning or pulling a repository containing submodules however, |
| 37 | these will not be checked out by default; the 'init' and 'update' |
| 38 | subcommands will maintain submodules checked out and at |
| 39 | appropriate revision in your working tree. |
Junio C Hamano | f69a0a0 | 2008-07-17 08:08:47 | [diff] [blame] | 40 | |
Junio C Hamano | 915cd9b | 2008-07-20 01:24:17 | [diff] [blame] | 41 | Submodules are composed from a so-called `gitlink` tree entry |
| 42 | in the main repository that refers to a particular commit object |
| 43 | within the inner repository that is completely separate. |
Junio C Hamano | f94fd6c | 2012-05-17 22:55:14 | [diff] [blame] | 44 | A record in the `.gitmodules` (see linkgit:gitmodules[5]) file at the |
| 45 | root of the source tree assigns a logical name to the submodule and |
| 46 | describes the default URL the submodule shall be cloned from. |
Junio C Hamano | 915cd9b | 2008-07-20 01:24:17 | [diff] [blame] | 47 | The logical name can be used for overriding this URL within your |
| 48 | local repository configuration (see 'submodule init'). |
| 49 | |
Junio C Hamano | 8c5d594 | 2015-06-11 19:37:48 | [diff] [blame] | 50 | Submodules are not to be confused with remotes, which are other |
| 51 | repositories of the same project; submodules are meant for |
| 52 | different projects you would like to make part of your source tree, |
| 53 | while the history of the two projects still stays completely |
| 54 | independent and you cannot modify the contents of the submodule |
| 55 | from within the main project. |
| 56 | If you want to merge the project histories and want to treat the |
| 57 | aggregated whole as a single project from then on, you may want to |
| 58 | add a remote for the other project and use the 'subtree' merge strategy, |
| 59 | instead of treating the other project as a submodule. Directories |
| 60 | that come from both projects can be cloned and checked out as a whole |
| 61 | if you choose to go that route. |
Junio C Hamano | f69a0a0 | 2008-07-17 08:08:47 | [diff] [blame] | 62 | |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 63 | COMMANDS |
| 64 | -------- |
Junio C Hamano | 1d90cb0 | 2007-07-03 07:05:31 | [diff] [blame] | 65 | add:: |
| 66 | Add the given repository as a submodule at the given path |
Junio C Hamano | 38ddcce | 2008-07-15 15:49:03 | [diff] [blame] | 67 | to the changeset to be committed next to the current |
Junio C Hamano | 85c7157 | 2008-07-28 00:03:31 | [diff] [blame] | 68 | project: the current project is termed the "superproject". |
Junio C Hamano | 38ddcce | 2008-07-15 15:49:03 | [diff] [blame] | 69 | + |
Junio C Hamano | 3b70d3c | 2009-11-21 17:37:37 | [diff] [blame] | 70 | This requires at least one argument: <repository>. The optional |
| 71 | argument <path> is the relative location for the cloned submodule |
| 72 | to exist in the superproject. If <path> is not given, the |
| 73 | "humanish" part of the source repository is used ("repo" for |
| 74 | "/path/to/repo.git" and "foo" for "host.xz:foo/.git"). |
Junio C Hamano | 3d1b5a1 | 2013-05-17 23:34:02 | [diff] [blame] | 75 | The <path> is also used as the submodule's logical name in its |
| 76 | configuration entries unless `--name` is used to specify a logical name. |
Junio C Hamano | 38ddcce | 2008-07-15 15:49:03 | [diff] [blame] | 77 | + |
| 78 | <repository> is the URL of the new submodule's origin repository. |
| 79 | This may be either an absolute URL, or (if it begins with ./ |
| 80 | or ../), the location relative to the superproject's origin |
Junio C Hamano | db472bc | 2012-01-04 00:22:37 | [diff] [blame] | 81 | repository (Please note that to specify a repository 'foo.git' |
| 82 | which is located right next to a superproject 'bar.git', you'll |
| 83 | have to use '../foo.git' instead of './foo.git' - as one might expect |
| 84 | when following the rules for relative URLs - because the evaluation |
| 85 | of relative URLs in Git is identical to that of relative directories). |
| 86 | If the superproject doesn't have an origin configured |
Junio C Hamano | 15567bc | 2011-07-23 00:51:59 | [diff] [blame] | 87 | the superproject is its own authoritative upstream and the current |
| 88 | working directory is used instead. |
Junio C Hamano | 38ddcce | 2008-07-15 15:49:03 | [diff] [blame] | 89 | + |
| 90 | <path> is the relative location for the cloned submodule to |
| 91 | exist in the superproject. If <path> does not exist, then the |
| 92 | submodule is created by cloning from the named URL. If <path> does |
Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 93 | exist and is already a valid Git repository, then this is added |
Junio C Hamano | 38ddcce | 2008-07-15 15:49:03 | [diff] [blame] | 94 | to the changeset without cloning. This second form is provided |
| 95 | to ease creating a new submodule from scratch, and presumes |
| 96 | the user will later push the submodule to the given URL. |
| 97 | + |
| 98 | In either case, the given URL is recorded into .gitmodules for |
| 99 | use by subsequent users cloning the superproject. If the URL is |
| 100 | given relative to the superproject's repository, the presumption |
| 101 | is the superproject and submodule repositories will be kept |
| 102 | together in the same relative location, and only the |
Junio C Hamano | 54bf1e2 | 2008-12-20 06:30:11 | [diff] [blame] | 103 | superproject's URL needs to be provided: git-submodule will correctly |
Junio C Hamano | 38ddcce | 2008-07-15 15:49:03 | [diff] [blame] | 104 | locate the submodule using the relative URL in .gitmodules. |
Junio C Hamano | 1d90cb0 | 2007-07-03 07:05:31 | [diff] [blame] | 105 | |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 106 | status:: |
| 107 | Show the status of the submodules. This will print the SHA-1 of the |
| 108 | currently checked out commit for each submodule, along with the |
Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 109 | submodule path and the output of 'git describe' for the |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 110 | SHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not |
Junio C Hamano | 5cd1518 | 2011-04-05 00:21:10 | [diff] [blame] | 111 | initialized, `+` if the currently checked out submodule commit |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 112 | does not match the SHA-1 found in the index of the containing |
Junio C Hamano | 5cd1518 | 2011-04-05 00:21:10 | [diff] [blame] | 113 | repository and `U` if the submodule has merge conflicts. |
Junio C Hamano | 0e066b9 | 2009-08-28 01:08:41 | [diff] [blame] | 114 | + |
Junio C Hamano | e1296e9 | 2011-08-08 22:58:15 | [diff] [blame] | 115 | If `--recursive` is specified, this command will recurse into nested |
Junio C Hamano | 0e066b9 | 2009-08-28 01:08:41 | [diff] [blame] | 116 | submodules, and show their status as well. |
Junio C Hamano | e1296e9 | 2011-08-08 22:58:15 | [diff] [blame] | 117 | + |
| 118 | If you are only interested in changes of the currently initialized |
| 119 | submodules with respect to the commit recorded in the index or the HEAD, |
| 120 | linkgit:git-status[1] and linkgit:git-diff[1] will provide that information |
| 121 | too (and can also report changes to a submodule's work tree). |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 122 | |
| 123 | init:: |
Junio C Hamano | 3d1b5a1 | 2013-05-17 23:34:02 | [diff] [blame] | 124 | Initialize the submodules recorded in the index (which were |
| 125 | added and committed elsewhere) by copying submodule |
| 126 | names and urls from .gitmodules to .git/config. |
| 127 | Optional <path> arguments limit which submodules will be initialized. |
Junio C Hamano | 5870066 | 2011-10-10 23:42:27 | [diff] [blame] | 128 | It will also copy the value of `submodule.$name.update` into |
| 129 | .git/config. |
Junio C Hamano | 915cd9b | 2008-07-20 01:24:17 | [diff] [blame] | 130 | The key used in .git/config is `submodule.$name.url`. |
| 131 | This command does not alter existing information in .git/config. |
| 132 | You can then customize the submodule clone URLs in .git/config |
Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 133 | for your local setup and proceed to `git submodule update`; |
| 134 | you can also just use `git submodule update --init` without |
Junio C Hamano | 915cd9b | 2008-07-20 01:24:17 | [diff] [blame] | 135 | the explicit 'init' step if you do not intend to customize |
| 136 | any submodule locations. |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 137 | |
Junio C Hamano | 240dc3f | 2013-03-25 23:37:03 | [diff] [blame] | 138 | deinit:: |
| 139 | Unregister the given submodules, i.e. remove the whole |
| 140 | `submodule.$name` section from .git/config together with their work |
| 141 | tree. Further calls to `git submodule update`, `git submodule foreach` |
| 142 | and `git submodule sync` will skip any unregistered submodules until |
| 143 | they are initialized again, so use this command if you don't want to |
Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 144 | have a local checkout of the submodule in your working tree anymore. If |
Junio C Hamano | 240dc3f | 2013-03-25 23:37:03 | [diff] [blame] | 145 | you really want to remove a submodule from the repository and commit |
| 146 | that use linkgit:git-rm[1] instead. |
| 147 | + |
Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 148 | When the command is run without pathspec, it errors out, |
| 149 | instead of deinit-ing everything, to prevent mistakes. |
| 150 | + |
| 151 | If `--force` is specified, the submodule's working tree will |
| 152 | be removed even if it contains local modifications. |
Junio C Hamano | 240dc3f | 2013-03-25 23:37:03 | [diff] [blame] | 153 | |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 154 | update:: |
Junio C Hamano | 0f7b5a9 | 2008-05-17 06:12:23 | [diff] [blame] | 155 | + |
Junio C Hamano | 6bf68cf | 2015-03-06 23:46:29 | [diff] [blame] | 156 | -- |
| 157 | Update the registered submodules to match what the superproject |
| 158 | expects by cloning missing submodules and updating the working tree of |
| 159 | the submodules. The "updating" can be done in several ways depending |
| 160 | on command line options and the value of `submodule.<name>.update` |
| 161 | configuration variable. Supported update procedures are: |
| 162 | |
| 163 | checkout;; the commit recorded in the superproject will be |
| 164 | checked out in the submodule on a detached HEAD. This is |
| 165 | done when `--checkout` option is given, or no option is |
| 166 | given, and `submodule.<name>.update` is unset, or if it is |
| 167 | set to 'checkout'. |
| 168 | + |
| 169 | If `--force` is specified, the submodule will be checked out (using |
| 170 | `git checkout --force` if appropriate), even if the commit specified |
| 171 | in the index of the containing repository already matches the commit |
| 172 | checked out in the submodule. |
| 173 | |
| 174 | rebase;; the current branch of the submodule will be rebased |
| 175 | onto the commit recorded in the superproject. This is done |
| 176 | when `--rebase` option is given, or no option is given, and |
| 177 | `submodule.<name>.update` is set to 'rebase'. |
| 178 | |
| 179 | merge;; the commit recorded in the superproject will be merged |
| 180 | into the current branch in the submodule. This is done |
| 181 | when `--merge` option is given, or no option is given, and |
| 182 | `submodule.<name>.update` is set to 'merge'. |
| 183 | |
| 184 | custom command;; arbitrary shell command that takes a single |
| 185 | argument (the sha1 of the commit recorded in the |
| 186 | superproject) is executed. This is done when no option is |
| 187 | given, and `submodule.<name>.update` has the form of |
| 188 | '!command'. |
| 189 | |
| 190 | When no option is given and `submodule.<name>.update` is set to 'none', |
| 191 | the submodule is not updated. |
| 192 | |
Junio C Hamano | 0f7b5a9 | 2008-05-17 06:12:23 | [diff] [blame] | 193 | If the submodule is not yet initialized, and you just want to use the |
| 194 | setting as stored in .gitmodules, you can automatically initialize the |
Junio C Hamano | e1296e9 | 2011-08-08 22:58:15 | [diff] [blame] | 195 | submodule with the `--init` option. |
Junio C Hamano | 6bf68cf | 2015-03-06 23:46:29 | [diff] [blame] | 196 | |
Junio C Hamano | e1296e9 | 2011-08-08 22:58:15 | [diff] [blame] | 197 | If `--recursive` is specified, this command will recurse into the |
Junio C Hamano | 0e066b9 | 2009-08-28 01:08:41 | [diff] [blame] | 198 | registered submodules, and update any nested submodules within. |
Junio C Hamano | 6bf68cf | 2015-03-06 23:46:29 | [diff] [blame] | 199 | -- |
Junio C Hamano | 8b588d5 | 2008-03-15 09:48:37 | [diff] [blame] | 200 | summary:: |
| 201 | Show commit summary between the given commit (defaults to HEAD) and |
| 202 | working tree/index. For a submodule in question, a series of commits |
| 203 | in the submodule between the given super project commit and the |
Junio C Hamano | e1296e9 | 2011-08-08 22:58:15 | [diff] [blame] | 204 | index or working tree (switched by `--cached`) are shown. If the option |
| 205 | `--files` is given, show the series of commits in the submodule between |
Junio C Hamano | c276ec7 | 2009-08-26 01:35:22 | [diff] [blame] | 206 | the index of the super project and the working tree of the submodule |
Junio C Hamano | e1296e9 | 2011-08-08 22:58:15 | [diff] [blame] | 207 | (this option doesn't allow to use the `--cached` option or to provide an |
Junio C Hamano | c276ec7 | 2009-08-26 01:35:22 | [diff] [blame] | 208 | explicit commit). |
Junio C Hamano | e1296e9 | 2011-08-08 22:58:15 | [diff] [blame] | 209 | + |
| 210 | Using the `--submodule=log` option with linkgit:git-diff[1] will provide that |
| 211 | information too. |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 212 | |
Junio C Hamano | 3f2f6e5 | 2008-08-21 10:34:22 | [diff] [blame] | 213 | foreach:: |
| 214 | Evaluates an arbitrary shell command in each checked out submodule. |
Junio C Hamano | a574a09 | 2010-06-13 19:57:10 | [diff] [blame] | 215 | The command has access to the variables $name, $path, $sha1 and |
| 216 | $toplevel: |
Junio C Hamano | 0e066b9 | 2009-08-28 01:08:41 | [diff] [blame] | 217 | $name is the name of the relevant submodule section in .gitmodules, |
Junio C Hamano | 3f2f6e5 | 2008-08-21 10:34:22 | [diff] [blame] | 218 | $path is the name of the submodule directory relative to the |
Junio C Hamano | a574a09 | 2010-06-13 19:57:10 | [diff] [blame] | 219 | superproject, $sha1 is the commit as recorded in the superproject, |
| 220 | and $toplevel is the absolute path to the top-level of the superproject. |
Junio C Hamano | 3f2f6e5 | 2008-08-21 10:34:22 | [diff] [blame] | 221 | Any submodules defined in the superproject but not checked out are |
Junio C Hamano | e1296e9 | 2011-08-08 22:58:15 | [diff] [blame] | 222 | ignored by this command. Unless given `--quiet`, foreach prints the name |
Junio C Hamano | 3f2f6e5 | 2008-08-21 10:34:22 | [diff] [blame] | 223 | of each submodule before evaluating the command. |
Junio C Hamano | e1296e9 | 2011-08-08 22:58:15 | [diff] [blame] | 224 | If `--recursive` is given, submodules are traversed recursively (i.e. |
Junio C Hamano | 0e066b9 | 2009-08-28 01:08:41 | [diff] [blame] | 225 | the given shell command is evaluated in nested submodules as well). |
Junio C Hamano | 3f2f6e5 | 2008-08-21 10:34:22 | [diff] [blame] | 226 | A non-zero return from the command in any submodule causes |
| 227 | the processing to terminate. This can be overridden by adding '|| :' |
| 228 | to the end of the command. |
| 229 | + |
Junio C Hamano | 73d812c | 2009-07-01 02:33:06 | [diff] [blame] | 230 | As an example, +git submodule foreach \'echo $path {backtick}git |
| 231 | rev-parse HEAD{backtick}'+ will show the path and currently checked out |
| 232 | commit for each submodule. |
Junio C Hamano | 3f2f6e5 | 2008-08-21 10:34:22 | [diff] [blame] | 233 | |
Junio C Hamano | f9e04eb | 2008-08-28 02:50:50 | [diff] [blame] | 234 | sync:: |
| 235 | Synchronizes submodules' remote URL configuration setting |
Junio C Hamano | 708376e | 2011-07-19 20:02:13 | [diff] [blame] | 236 | to the value specified in .gitmodules. It will only affect those |
Junio C Hamano | 0ff9816 | 2012-03-31 18:19:09 | [diff] [blame] | 237 | submodules which already have a URL entry in .git/config (that is the |
Junio C Hamano | 708376e | 2011-07-19 20:02:13 | [diff] [blame] | 238 | case when they are initialized or freshly added). This is useful when |
Junio C Hamano | f9e04eb | 2008-08-28 02:50:50 | [diff] [blame] | 239 | submodule URLs change upstream and you need to update your local |
| 240 | repositories accordingly. |
| 241 | + |
| 242 | "git submodule sync" synchronizes all submodules while |
Junio C Hamano | 360e3a1 | 2011-07-13 23:51:56 | [diff] [blame] | 243 | "git submodule sync \-- A" synchronizes submodule "A" only. |
Junio C Hamano | 45b356c | 2015-12-11 21:31:17 | [diff] [blame] | 244 | + |
| 245 | If `--recursive` is specified, this command will recurse into the |
| 246 | registered submodules, and sync any nested submodules within. |
Junio C Hamano | 3f2f6e5 | 2008-08-21 10:34:22 | [diff] [blame] | 247 | |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 248 | OPTIONS |
| 249 | ------- |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 250 | -q:: |
| 251 | --quiet:: |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 252 | Only print error messages. |
| 253 | |
Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 254 | --all:: |
| 255 | This option is only valid for the deinit command. Unregister all |
| 256 | submodules in the working tree. |
| 257 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 258 | -b:: |
| 259 | --branch:: |
Junio C Hamano | 1d90cb0 | 2007-07-03 07:05:31 | [diff] [blame] | 260 | Branch of repository to add as submodule. |
Junio C Hamano | 52b6ba3 | 2014-04-01 00:26:48 | [diff] [blame] | 261 | The name of the branch is recorded as `submodule.<name>.branch` in |
Junio C Hamano | 4a401d5 | 2016-10-26 22:24:37 | [diff] [blame] | 262 | `.gitmodules` for `update --remote`. A special value of `.` is used to |
| 263 | indicate that the name of the branch in the submodule should be the |
| 264 | same name as the current branch in the current repository. |
Junio C Hamano | 1d90cb0 | 2007-07-03 07:05:31 | [diff] [blame] | 265 | |
Junio C Hamano | afabd32 | 2010-07-19 20:26:15 | [diff] [blame] | 266 | -f:: |
| 267 | --force:: |
Junio C Hamano | 240dc3f | 2013-03-25 23:37:03 | [diff] [blame] | 268 | This option is only valid for add, deinit and update commands. |
Junio C Hamano | 6003346 | 2011-05-03 00:48:43 | [diff] [blame] | 269 | When running add, allow adding an otherwise ignored submodule path. |
Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 270 | When running deinit the submodule working trees will be removed even |
| 271 | if they contain local changes. |
Junio C Hamano | 6bf68cf | 2015-03-06 23:46:29 | [diff] [blame] | 272 | When running update (only effective with the checkout procedure), |
| 273 | throw away local changes in submodules when switching to a |
| 274 | different commit; and always run a checkout operation in the |
| 275 | submodule, even if the commit listed in the index of the |
| 276 | containing repository matches the commit checked out in the |
| 277 | submodule. |
Junio C Hamano | afabd32 | 2010-07-19 20:26:15 | [diff] [blame] | 278 | |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 279 | --cached:: |
Junio C Hamano | 8b588d5 | 2008-03-15 09:48:37 | [diff] [blame] | 280 | This option is only valid for status and summary commands. These |
| 281 | commands typically use the commit found in the submodule HEAD, but |
| 282 | with this option, the commit stored in the index is used instead. |
| 283 | |
Junio C Hamano | c276ec7 | 2009-08-26 01:35:22 | [diff] [blame] | 284 | --files:: |
| 285 | This option is only valid for the summary command. This command |
| 286 | compares the commit in the index with that in the submodule HEAD |
| 287 | when this option is used. |
| 288 | |
Junio C Hamano | eb41599 | 2008-06-08 22:49:47 | [diff] [blame] | 289 | -n:: |
| 290 | --summary-limit:: |
Junio C Hamano | 8b588d5 | 2008-03-15 09:48:37 | [diff] [blame] | 291 | This option is only valid for the summary command. |
| 292 | Limit the summary size (number of commits shown in total). |
Junio C Hamano | 1bdd3b0 | 2008-04-13 05:33:18 | [diff] [blame] | 293 | Giving 0 will disable the summary; a negative number means unlimited |
Junio C Hamano | 8b588d5 | 2008-03-15 09:48:37 | [diff] [blame] | 294 | (the default). This limit only applies to modified submodules. The |
| 295 | size is always limited to 1 for added/deleted/typechanged submodules. |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 296 | |
Junio C Hamano | abad6da | 2013-01-06 09:06:32 | [diff] [blame] | 297 | --remote:: |
| 298 | This option is only valid for the update command. Instead of using |
| 299 | the superproject's recorded SHA-1 to update the submodule, use the |
Junio C Hamano | 8401f14 | 2013-07-12 22:47:46 | [diff] [blame] | 300 | status of the submodule's remote-tracking branch. The remote used |
Junio C Hamano | abad6da | 2013-01-06 09:06:32 | [diff] [blame] | 301 | is branch's remote (`branch.<name>.remote`), defaulting to `origin`. |
| 302 | The remote branch used defaults to `master`, but the branch name may |
| 303 | be overridden by setting the `submodule.<name>.branch` option in |
| 304 | either `.gitmodules` or `.git/config` (with `.git/config` taking |
| 305 | precedence). |
| 306 | + |
| 307 | This works for any of the supported update procedures (`--checkout`, |
| 308 | `--rebase`, etc.). The only change is the source of the target SHA-1. |
| 309 | For example, `submodule update --remote --merge` will merge upstream |
| 310 | submodule changes into the submodules, while `submodule update |
| 311 | --merge` will merge superproject gitlink changes into the submodules. |
| 312 | + |
| 313 | In order to ensure a current tracking branch state, `update --remote` |
| 314 | fetches the submodule's remote repository before calculating the |
| 315 | SHA-1. If you don't want to fetch, you should use `submodule update |
| 316 | --remote --no-fetch`. |
Junio C Hamano | 5b3533d | 2014-02-27 23:07:15 | [diff] [blame] | 317 | + |
| 318 | Use this option to integrate changes from the upstream subproject with |
| 319 | your submodule's current HEAD. Alternatively, you can run `git pull` |
| 320 | from the submodule, which is equivalent except for the remote branch |
| 321 | name: `update --remote` uses the default upstream repository and |
| 322 | `submodule.<name>.branch`, while `git pull` uses the submodule's |
| 323 | `branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want |
| 324 | to distribute the default upstream branch with the superproject and |
| 325 | `branch.<name>.merge` if you want a more native feel while working in |
| 326 | the submodule itself. |
Junio C Hamano | abad6da | 2013-01-06 09:06:32 | [diff] [blame] | 327 | |
Junio C Hamano | 8bc410e | 2009-02-15 10:38:19 | [diff] [blame] | 328 | -N:: |
| 329 | --no-fetch:: |
| 330 | This option is only valid for the update command. |
| 331 | Don't fetch new objects from the remote site. |
| 332 | |
Junio C Hamano | 81703b2 | 2014-03-14 22:00:27 | [diff] [blame] | 333 | --checkout:: |
| 334 | This option is only valid for the update command. |
| 335 | Checkout the commit recorded in the superproject on a detached HEAD |
| 336 | in the submodule. This is the default behavior, the main use of |
| 337 | this option is to override `submodule.$name.update` when set to |
Junio C Hamano | 6bf68cf | 2015-03-06 23:46:29 | [diff] [blame] | 338 | a value other than `checkout`. |
Junio C Hamano | 81703b2 | 2014-03-14 22:00:27 | [diff] [blame] | 339 | If the key `submodule.$name.update` is either not explicitly set or |
| 340 | set to `checkout`, this option is implicit. |
| 341 | |
Junio C Hamano | 0e88f3e | 2009-06-21 08:03:25 | [diff] [blame] | 342 | --merge:: |
| 343 | This option is only valid for the update command. |
| 344 | Merge the commit recorded in the superproject into the current branch |
| 345 | of the submodule. If this option is given, the submodule's HEAD will |
| 346 | not be detached. If a merge failure prevents this process, you will |
| 347 | have to resolve the resulting conflicts within the submodule with the |
| 348 | usual conflict resolution tools. |
| 349 | If the key `submodule.$name.update` is set to `merge`, this option is |
| 350 | implicit. |
| 351 | |
Junio C Hamano | 25e7ba6 | 2009-06-14 01:03:22 | [diff] [blame] | 352 | --rebase:: |
| 353 | This option is only valid for the update command. |
| 354 | Rebase the current branch onto the commit recorded in the |
| 355 | superproject. If this option is given, the submodule's HEAD will not |
Junio C Hamano | 167b138 | 2010-01-31 23:04:31 | [diff] [blame] | 356 | be detached. If a merge failure prevents this process, you will have |
Junio C Hamano | 25e7ba6 | 2009-06-14 01:03:22 | [diff] [blame] | 357 | to resolve these failures with linkgit:git-rebase[1]. |
| 358 | If the key `submodule.$name.update` is set to `rebase`, this option is |
| 359 | implicit. |
| 360 | |
Junio C Hamano | e1296e9 | 2011-08-08 22:58:15 | [diff] [blame] | 361 | --init:: |
| 362 | This option is only valid for the update command. |
| 363 | Initialize all submodules for which "git submodule init" has not been |
| 364 | called so far before updating. |
| 365 | |
Junio C Hamano | a129545 | 2012-11-13 22:32:04 | [diff] [blame] | 366 | --name:: |
| 367 | This option is only valid for the add command. It sets the submodule's |
| 368 | name to the given string instead of defaulting to its path. The name |
| 369 | must be valid as a directory name and may not end with a '/'. |
| 370 | |
Junio C Hamano | 7ae1825 | 2009-05-23 09:53:32 | [diff] [blame] | 371 | --reference <repository>:: |
| 372 | This option is only valid for add and update commands. These |
| 373 | commands sometimes need to clone a remote repository. In this case, |
| 374 | this option will be passed to the linkgit:git-clone[1] command. |
| 375 | + |
| 376 | *NOTE*: Do *not* use this option unless you have read the note |
Junio C Hamano | e1296e9 | 2011-08-08 22:58:15 | [diff] [blame] | 377 | for linkgit:git-clone[1]'s `--reference` and `--shared` options carefully. |
Junio C Hamano | 7ae1825 | 2009-05-23 09:53:32 | [diff] [blame] | 378 | |
Junio C Hamano | 0e066b9 | 2009-08-28 01:08:41 | [diff] [blame] | 379 | --recursive:: |
Junio C Hamano | 45b356c | 2015-12-11 21:31:17 | [diff] [blame] | 380 | This option is only valid for foreach, update, status and sync commands. |
Junio C Hamano | 0e066b9 | 2009-08-28 01:08:41 | [diff] [blame] | 381 | Traverse submodules recursively. The operation is performed not |
| 382 | only in the submodules of the current repo, but also |
| 383 | in any nested submodules inside those submodules (and so on). |
| 384 | |
Junio C Hamano | ededf2b | 2013-07-15 21:11:16 | [diff] [blame] | 385 | --depth:: |
| 386 | This option is valid for add and update commands. Create a 'shallow' |
| 387 | clone with a history truncated to the specified number of revisions. |
| 388 | See linkgit:git-clone[1] |
| 389 | |
Junio C Hamano | fedb1b4 | 2016-06-20 21:23:40 | [diff] [blame] | 390 | --[no-]recommend-shallow:: |
| 391 | This option is only valid for the update command. |
| 392 | The initial clone of a submodule will use the recommended |
| 393 | `submodule.<name>.shallow` as provided by the .gitmodules file |
| 394 | by default. To ignore the suggestions use `--no-recommend-shallow`. |
| 395 | |
Junio C Hamano | bec5da4 | 2016-04-06 22:58:21 | [diff] [blame] | 396 | -j <n>:: |
| 397 | --jobs <n>:: |
| 398 | This option is only valid for the update command. |
| 399 | Clone new submodules in parallel with as many jobs. |
| 400 | Defaults to the `submodule.fetchJobs` option. |
Junio C Hamano | ededf2b | 2013-07-15 21:11:16 | [diff] [blame] | 401 | |
Junio C Hamano | 9e39507 | 2008-07-31 22:11:21 | [diff] [blame] | 402 | <path>...:: |
| 403 | Paths to submodule(s). When specified this will restrict the command |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 404 | to only operate on the submodules found at the specified paths. |
Junio C Hamano | 38ddcce | 2008-07-15 15:49:03 | [diff] [blame] | 405 | (This argument is required with add). |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 406 | |
| 407 | FILES |
| 408 | ----- |
Junio C Hamano | 16f9887 | 2007-06-12 16:09:14 | [diff] [blame] | 409 | When initializing submodules, a .gitmodules file in the top-level directory |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 410 | of the containing repository is used to find the url of each submodule. |
Junio C Hamano | 91baf10 | 2007-12-31 09:44:26 | [diff] [blame] | 411 | This file should be formatted in the same way as `$GIT_DIR/config`. The key |
Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 412 | to each submodule url is "submodule.$name.url". See linkgit:gitmodules[5] |
Junio C Hamano | e66c6c0 | 2007-12-17 08:26:13 | [diff] [blame] | 413 | for details. |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 414 | |
Junio C Hamano | 38b693c | 2007-06-03 08:40:14 | [diff] [blame] | 415 | GIT |
| 416 | --- |
Junio C Hamano | f7c042d | 2008-06-06 22:50:53 | [diff] [blame] | 417 | Part of the linkgit:git[1] suite |